When setting the GtkTreeView's model, set prelight_node, prelight_tree,

2002-01-28  Jon Trowbridge  <trow@gnu.org>

	* gtk/gtktreeview.c (gtk_tree_view_set_model): When setting the
	GtkTreeView's model, set prelight_node, prelight_tree,
	button_pressed_node and button_pressed_tree to NULL. (#69603)

diff --git a/ChangeLog b/ChangeLog
index f9680bec3b985acf0dc9c6a080247df4b3da7f3b..b470400dd0edb551a60b2b56a17fe3f3f0447dc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-28  Jon Trowbridge  <trow@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): When setting the
+       GtkTreeView's model, set prelight_node, prelight_tree,
+       button_pressed_node and button_pressed_tree to NULL. (#69603)
+
 2002-01-28 Bill Haneman <bill.haneman@sun.com>
 
        * gtk/gtkstyle.c:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f9680bec3b985acf0dc9c6a080247df4b3da7f3b..b470400dd0edb551a60b2b56a17fe3f3f0447dc8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-01-28  Jon Trowbridge  <trow@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): When setting the
+       GtkTreeView's model, set prelight_node, prelight_tree,
+       button_pressed_node and button_pressed_tree to NULL. (#69603)
+
 2002-01-28 Bill Haneman <bill.haneman@sun.com>
 
        * gtk/gtkstyle.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f9680bec3b985acf0dc9c6a080247df4b3da7f3b..b470400dd0edb551a60b2b56a17fe3f3f0447dc8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-01-28  Jon Trowbridge  <trow@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): When setting the
+       GtkTreeView's model, set prelight_node, prelight_tree,
+       button_pressed_node and button_pressed_tree to NULL. (#69603)
+
 2002-01-28 Bill Haneman <bill.haneman@sun.com>
 
        * gtk/gtkstyle.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f9680bec3b985acf0dc9c6a080247df4b3da7f3b..b470400dd0edb551a60b2b56a17fe3f3f0447dc8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-01-28  Jon Trowbridge  <trow@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): When setting the
+       GtkTreeView's model, set prelight_node, prelight_tree,
+       button_pressed_node and button_pressed_tree to NULL. (#69603)
+
 2002-01-28 Bill Haneman <bill.haneman@sun.com>
 
        * gtk/gtkstyle.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f9680bec3b985acf0dc9c6a080247df4b3da7f3b..b470400dd0edb551a60b2b56a17fe3f3f0447dc8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-01-28  Jon Trowbridge  <trow@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): When setting the
+       GtkTreeView's model, set prelight_node, prelight_tree,
+       button_pressed_node and button_pressed_tree to NULL. (#69603)
+
 2002-01-28 Bill Haneman <bill.haneman@sun.com>
 
        * gtk/gtkstyle.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f9680bec3b985acf0dc9c6a080247df4b3da7f3b..b470400dd0edb551a60b2b56a17fe3f3f0447dc8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-01-28  Jon Trowbridge  <trow@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): When setting the
+       GtkTreeView's model, set prelight_node, prelight_tree,
+       button_pressed_node and button_pressed_tree to NULL. (#69603)
+
 2002-01-28 Bill Haneman <bill.haneman@sun.com>
 
        * gtk/gtkstyle.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f9680bec3b985acf0dc9c6a080247df4b3da7f3b..b470400dd0edb551a60b2b56a17fe3f3f0447dc8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-01-28  Jon Trowbridge  <trow@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): When setting the
+       GtkTreeView's model, set prelight_node, prelight_tree,
+       button_pressed_node and button_pressed_tree to NULL. (#69603)
+
 2002-01-28 Bill Haneman <bill.haneman@sun.com>
 
        * gtk/gtkstyle.c:

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 3a66180282c60406655beae6efd06b0d51360213..9848677c3727927d0f7a1d6a5490876d7e818e94 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6728,6 +6728,12 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
          _gtk_rbtree_free (tree_view->priv->tree);
          tree_view->priv->tree = NULL;
        }
+
+      tree_view->priv->prelight_node = NULL;
+      tree_view->priv->prelight_tree = NULL;
+      tree_view->priv->button_pressed_node = NULL;
+      tree_view->priv->button_pressed_tree = NULL;
+
       gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
       tree_view->priv->drag_dest_row = NULL;
       gtk_tree_row_reference_free (tree_view->priv->cursor);